Merge tag 'upstream/2016.8' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 6 Sep 2016 08:02:00 +0000 (09:02 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 6 Sep 2016 08:02:00 +0000 (09:02 +0100)
Upstream version 2016.8


Trivial merge